From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 16 May 1993 23:09:57 +0000 (+0000)
Subject: (push-mark): Always activate the mark if not in Transient Mark mode.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~96216
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=8cdc660f671bea4dfac5303503d2adbb4ed69a69;p=emacs.git

(push-mark): Always activate the mark if not in Transient Mark mode.
---

diff --git a/lisp/simple.el b/lisp/simple.el
index da522aca3ea..3b2f28b6e33 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1262,7 +1262,7 @@ purposes.  See the documentation of `set-mark' for more information."
 (defun push-mark (&optional location nomsg activate)
   "Set mark at LOCATION (point, by default) and push old mark on mark ring.
 Display `Mark set' unless the optional second arg NOMSG is non-nil.
-Activate the mark if optional third arg ACTIVATE is non-nil.
+In Transient Mark mode, activate mark if optional third arg ACTIVATE non-nil.
 
 Novice Emacs Lisp programmers often try to use the mark for the wrong
 purposes.  See the documentation of `set-mark' for more information.
@@ -1278,7 +1278,8 @@ In Transient Mark mode, this does not activate the mark."
   (set-marker (mark-marker) (or location (point)) (current-buffer))
   (or nomsg executing-macro (> (minibuffer-depth) 0)
       (message "Mark set"))
-  (if activate (set-mark (mark t)))
+  (if (or activate (not transient-mark-mode))
+      (set-mark (mark t)))
   nil)
 
 (defun pop-mark ()